From: Matthias Devlamynck <matthias.devlamynck@mailoo.org>
Date: Wed, 4 Oct 2017 19:24:26 +0000 (+0200)
Subject: Fix error message when Cargo.toml misses a [package] section, remove an unused import
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2~19^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=4cd544cd6fbaf285a811c97ffed3f3e3a906e6e0;p=cargo.git

Fix error message when Cargo.toml misses a [package] section, remove an unused import
---

diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
index c2220ac2d..e9e7fe8ae 100644
--- a/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@ -513,7 +513,7 @@ impl TomlManifest {
 
         let project = me.project.as_ref().or_else(|| me.package.as_ref());
         let project = project.ok_or_else(|| {
-            CargoError::from("no `package` or `project` section found.")
+            CargoError::from("no `package` section found.")
         })?;
 
         let package_name = project.name.trim();
diff --git a/tests/build.rs b/tests/build.rs
index 3bc34ca3a..f8fc6e912 100644
--- a/tests/build.rs
+++ b/tests/build.rs
@@ -92,7 +92,7 @@ fn cargo_compile_with_invalid_manifest() {
 [ERROR] failed to parse manifest at `[..]`
 
 Caused by:
-  no `package` or `project` section found.
+  no `package` section found.
 "))
 }
 
diff --git a/tests/jobserver.rs b/tests/jobserver.rs
index 7356c73b0..2e7e8b816 100644
--- a/tests/jobserver.rs
+++ b/tests/jobserver.rs
@@ -1,7 +1,6 @@
 extern crate cargotest;
 extern crate hamcrest;
 
-use std::str;
 use std::net::TcpListener;
 use std::thread;
 use std::process::Command;
diff --git a/tests/metadata.rs b/tests/metadata.rs
index 25a0edf01..6293e1648 100644
--- a/tests/metadata.rs
+++ b/tests/metadata.rs
@@ -547,7 +547,7 @@ fn cargo_metadata_with_invalid_manifest() {
 [ERROR] failed to parse manifest at `[..]`
 
 Caused by:
-  no `package` or `project` section found."))
+  no `package` section found."))
 }
 
 const MANIFEST_OUTPUT: &'static str=